(x-resolve-font-name): Don't pass FACE to x-list-fonts

if FACE has nil as its font.

diff --git a/lisp/faces.el b/lisp/faces.el
index 32a0c995ab07fcac11a08c4bd8b5c1c147eb70fb..5abcd0927c23c18a259e2f0cf7f11a8efde1e160 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -439,7 +439,9 @@ also the same size as FACE on FRAME."
   (and (eq frame t)
        (setq frame nil))
   (if pattern
-      (let ((fonts (x-list-fonts pattern face frame)))
+      (let ((fonts (x-list-fonts pattern
+                                (if (face-font face) face nil)
+                                frame)))
        (or fonts
            (if face
                (error "No fonts matching pattern are the same size as `%s'"